[IA64] cleanup extraneous function name change from upstream

irq_exit() was briefly renamed to xen_irq_exit(), but the change
is no longer necessary.  Reverting to original name and parameters.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff --git a/xen/arch/ia64/linux-xen/irq_ia64.c b/xen/arch/ia64/linux-xen/irq_ia64.c
index e5adfa6869f73d03742bfbc39a69480d7c1452eb..346de4c1673060630140ab8f5e79c810f6ef762f 100644 (file)
--- a/xen/arch/ia64/linux-xen/irq_ia64.c
+++ b/xen/arch/ia64/linux-xen/irq_ia64.c
@@ -169,7 +169,7 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs)
         * handler needs to be able to wait for further keyboard interrupts, which can't
         * come through until ia64_eoi() has been done.
         */
-       xen_irq_exit(regs);
+       irq_exit();
 }
 
 #ifdef CONFIG_HOTPLUG_CPU

diff --git a/xen/arch/ia64/xen/xenirq.c b/xen/arch/ia64/xen/xenirq.c
index e40daeb832a98dc49bafe7d32a43c46d49613fc6..23d761c0c5669ef3588f8c0d10f4f7fafa02e940 100644 (file)
--- a/xen/arch/ia64/xen/xenirq.c
+++ b/xen/arch/ia64/xen/xenirq.c
@@ -59,7 +59,7 @@ xen_do_IRQ(ia64_vector vector)
 /*
  * Exit an interrupt context. Process softirqs if needed and possible:
  */
-void xen_irq_exit(struct pt_regs *regs)
+void irq_exit(void)
 {
        sub_preempt_count(IRQ_EXIT_OFFSET);
 }